dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b382576 fb99a61)

author	Glenn Morris <rgm@gnu.org>
	Thu, 12 May 2011 07:07:06 +0000 (00:07 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Thu, 12 May 2011 07:07:06 +0000 (00:07 -0700)
commit	7c3f7cfd339f0445fdcb8b9feff8e29045d90f1b
tree	66f2cc8f0383dc2739d0162c6d6c651ea0353e55	tree \| snapshot
parent	b382576c6687e4148faa66607e8d0ea892529d06	commit \| diff
parent	fb99a6140fcafbaa8253489110ba637b6b69fecb	commit \| diff

Merge from emacs-23; up to r100577.

14 files changed:

doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/elisp.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/files.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/modes.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/vol1.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/vol2.texi	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/which-func.el	diff1 \|	diff2 \|	blob \| history
lisp/vc/smerge-mode.el	diff1 \|	\|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/textprop.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history
src/xterm.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.